fixes to repopick