Stopwork fixes