Some funky fixes :)