Fixed a few issues discovered during state.highstate on fresh machine.
Fixed issues with source_hashes