EthanR: couple fixes