Fix configuration issues