More fixes, still doesn't build