Fixes for body profile schema change