Fixes a few more bugs. The project once again compiles!