A couple extra more fixes :)