Fix stupid derp bugs