Fix several fixes