made a few changes to fix phab issues reported in admin interface