fixes after latest tests (20131024)