Fixes for the mid-term demo
Fixed merge conflicts