Fixing Admin related issues