Sanity fixes.