Shorten Back to Kill time and fix small derps

Change-Id: Ia3e50ebf37a108671596d9f9c73a417727e8384f