Mecwerks-Logic: Fix ups from last pull.