Some main comp fixes