Add essential fixes