Improved kill
 - Fix potential endless loop if another build (not already queued) was started after kill