Last fixes (hopefully...)