Small changes to speaker system code