Defficiency fixes