Changes for YUI-compat fixes