couple more entityapi replacements