Few mgmt server tweaks & fixes