Fixes for `Spyc`