Minor bug fixes

Made it so that the solution could build successfully.