Some public fixes