Improves some safety features