More Derp Fixes