Several small fixes from Ray