Fix issues arising post-merge

This commit is contained in:
G.Ambatte
2021-03-04 22:01:37 -05:00
committed by Trevor Buckner
parent 2f9bd00d70
commit 3358094319