apply fixes from Silent Dawn