more fixes i guess?