Updating keywords
Removing compile warning