Puneet's fixes