Fixes for my derp.