Add several fixes