fixes from ccc