Fix some more in the sources. See #31