Even more code reviews and fixes