quick fixes to https://github.com/Link7/wpro/issues/3