Fix some fallout from the array conversion, picoId refactoring, etc.