- Cleaned up some warnings