Final fixes
-