Some quick fixes

These stem from a few issues @percyhanna pointed out.