Add default shapes to model
Fix more compile errors from merge!