Whats new fixes

Includes changes from PR of @srinivasupadhya as well.