Set of fixes