Rework some system tweaks (part 1)

Change-Id: Id9163b9724550dae3530ced0cb38eac002ce2678