Fixes for checking.
Remove debug code.