Merge "Fixes to simplify programmatic creation." into graphics-dev