More fixes, more bugs