Some bugfixes in new source classes.