Various fallout fixes