Fixes from initial funkload testing.