Cleanup and multisampling fixes