Fixed some compiler errors (new version rustc)