First commit, so far only a few CJ 2008 problems.