Few updates that were not checked-in yet