Some small but fixes after real world testing