Hotfixes for live Arch-Only version [DON'T MERGE INTO MASTER]