Even more fixes yeay! :)