Minor changes for Osclass 3.2 compatibility.