Fixed issues mentioned by olly