Minor fixes to fit new version of RokUtil.