- Removed some g++ warnings