More goober fixes.