Some more Wow6432Node fixes