Fixed last of the bugs for v2.3