Final fall fixes