Minor changes to improve creation workflow