Some fixes to reset and keyword.