fixes for issues WMS-113 and WMS-114