Cra 664, Cra 665

Surface bug fixes