Last set of fixes