Fix some errors on the start