Cahanges
Set of fixes.