fixes after michael