fixes for hosted version