FT-312 cleanup a bit