Sanity Fixes