Push fixes for issues I'm running into

Fixes a couple small items that broke the compile for me.