Fixed some other review comments