Fire-in-the-ass fixes