Fixing problems revealed in review