Some fixes
FInal commi