Bugs fixed for admin module