Changes to get the project compiling again.