bug fixes from qa