Fix build issues after compiler update