Some fixes addressed earlier