Bug fixes after pilots with Raffi and Rodney