Diffusion Apper 3e7d4d95845d

Some more autos and fixes

Authored by dantti on Feb 19 2018, 8:43 PM.