Even more fixes

Forgot to clean the garbage generated in the last commit.