PLT-404 Changed workarounds to explicit flags