Some changes so that some wms builds properly