i386: minor fixes