Fixes a couple review issues