Tiny fixes/improvements

Just some small fixes.