Fixes system and workflow bugs