- Removed some warnings