fixes for "Possible strict violation"