Update more to compatible target frameworks