Minor speedups
Forgot a debug line