Bug fixes

Thanks to Francis for his help with Xeon processor support!