More fixes, stuff