Change fluid registration to standard
Fix merge conflicts