fixes to be compliant to latest code
