Fix some errors on setup