Minor Fixes
- Adjusted for new server