Fix advanced drawbridge weirdness