-O3 support & @JustArchi tweaks

Change-Id: I4cdcb0ff34f9bea58b19788fc6fb437ee8362ef9