Such bug fixes. Very admin privileges.

Addresses #1813 , #1812 
Patches #1532, #1782