Some more fudges / unfudges / skip -> todo changes