Better formatting on PLATFORM=none
Tweaks for smoother compilation