Fix configuration related issues