WYOCL: Fixed some more bugs on different hardware configurations