A few lib based changes for meta-sourcery.