Fixes for new rustc
Fix tests