Updates to get it to compile on i686 (Atom, Ubilinux)