Fix some errors, maybe