Fix some orphans