Minor fixes derp derp