Addition fixes