Cleaned up debugging issues