Last fixes for public