Fixed all issues of May28