Fixes to issues discovered during end-to-end "testing"