FIx problems