Added customer fixes