Minor compatibility changes, prep for cleanup