Fix some strange behaviour with stopping and killing objects.