Fixing warnings, merging configuration properly