Fixed internal project issues