More binop fixes