Tweak makefile
Fixes for latest Rust nightly