More fixes for errors, hopefully