Core: CS fixes + cleanup
Installer: Small fixes