fix type clash warnings