Import reorg and removed some warnings

Just being pedantic really