additional fixes in the vein of the previous commit