Some fixes for the fet controller