More non-interactive fixes