Fix a few more bugs after the revamp