Errors sort of fixed