Bugfixes for VexCL compatibility