minors fixes