Fixing a couple of issues with my previous commits