Do some changes due to project preparation