several fixes for inspire