Fixes and WebAdmin Cleanup