volume and factory fixes