Fix couple minor bugs with #2138 work