Some more changes for our usage