Dev Sync (35)

A few bug fixes, including additions for upcoming administration update.
Tied to DS48