Removed compilation issues and warnings.