Fix build warnings with rust master