Fixing config system

Signed-off-by: Olli Vanhoja <olli.vanhoja@gmail.com>