fix additional issues