Fix healing issues

Should fix the issues had...