Making some changes to make the project compile.