some public fixes