Compiles on nute, and some fixes