Last problems fixed