Fixes from recent test install