More fixes, still issues