Fixes some model problems.