Fixing up issues we discussed on the previous commit