More explicit extension including

More places where this needs to be done.