Small yammer bug fixes