fixes after changes in master