more manual run fixes