Attempt to solve minor errors