Removed some warnings in DEBUG == 1