a set of fixes on pc
none -> invalid