Fix up a few errors thanks to codeahq