some more halfassed fixes