Fixed some config errors etc.