more all-man fixes