Minor changes to allow simple broadcasting (add and sub)