Add basic sanity stuff