More fixes and make the -short test not fail