Fix some in 03/06