Forgot to push these small changes from a while ago