Small fixes for dawnofthefly