Bug fixes with SAC not last hitting