lonely type signatures don't crash anymore, other fixes