First couple of fixes to make it compile with Universal 3.3.2.
1 file changed