Customer fixes