comp fixes