Fixes by Vineet