Small fixes in Control Panel