Fixed bundle gemsets, changed kill service code