Fixes for encoding