Last fixes (hopefully)