Fix Makefile so proper library is outputted
Fix any problems with transistion to Rust master