Small fixes

An attempt to reduce Config dependency