Make further fixes