Admin Fixes

Fixes SPOT-2084, SPOT-2127, and SPOT-1304.