Cleaned up a few other things to make it compile nicely