Barely fix up CC and BA forms