Fix timeout and kill