Fixes to accommodate master/plugin loading
Fixed broken profile actions