Bugfixes for intel