Fixes for stray bits.