Fix sesnape's bugs