Some gall related fixes.