minor keyword.other improvements