Some fixes
reformal