More fixes, seems to be working now!