Fixes for instancing