Fixed a few review comments