gnm: fixed some issues