Minor fixes for wps-gui build