Misc HMVC fixes