language changes: got rid of deprecation warnings.