Merged assistant fixes (#252 in this repo)