More minor derps and fixes.