Fixes that should go back into the master.

profile name default shouldn't be hardcoded