Various fixes

two arguments?