Minor fixes for physical machine manager