fix some non required