Fixed minor suggestions by bunnei