Bugfixes for quick create