some fixes i guess