Fixes for issues discoverd during testing.OMEKA-552