fix known issues