Fixed 2.5 problems but had to move appcomcat reference.