Minor o3 warning fixes