fixing issues after qa