fixes after changes in API