General commit (no IDs open) - Modifications for bad implementations

[permalink]