Fixing bugs raised in review