Minor updates to solidify Ehmbr interface