JY changes and sanity fixes