Small fixups assigned by sir Amer