Even more goddamn fixes.