More from_be/to_be changes