Some fixes to make it full operational using 6.0.1