Some small fixes

DERP