Some simple fixes

Long-time, no-commit; I fixed a few things!