Fixes a few things from the PR