Fixes for rust nightly

More macro fixes for the latest nightly!