Bugfixes cleanups

I often use it with both lines uncommented