Align compiler and options with master