more comp fixes