Minor fixes to admin area to support changes from closed issue #3