Fix some errors I guess?