Removed debug logging
Small fixes