Minor fixes and new workflow additions