Fixes for method call codegen