saving fixes for HW system