Fixes for 2D model encoders