Merge "Align flags with make"