Various fixes for YUI