Fix some issues that Ernie ran into