fixes after latest test 20131028