More fixes, still gives an error.