Push fixes for issues I'm running into