Logic- + Derp-fixes