Fixes for no sync crate