Fixes and small improvments with configuration