Fix a few things in the previous commits