more fixes related to issue WMS-88