[FIX] Set of fixes