Some fix to have more standard code.