Yet more fixes, Ill figure this out eventually