Minor updates to make everything build and run