Few other changes