Fixing build after updating to latest master