further fixes for release!