Couple of mall fixes for submission