1.5 Updates

More updates for 1.5 compatibility.