Sanity fixes