Fix uniform guards