Fixes & config merge
Fixes & config merge