Some issues fixed to be able to run full test.