Fixing issues from comments on the commit