just fix the mentioned issues