Model fixes for demo
fix merge