fixes to be more friendly to public