Fix some of the problem