MOAR fixes for patterns