Assorted fixes toward making the project build