more fixes - cdyne