Bug fixes and workflow improvements