public fixes