Some further fixes after merging master in here