Also fixes error in 'kill' target (already fixed in 2.7, somehow the fix didn't make it to this branch).
