Various self-evident small fixes/improvements

These are just some low-priority improvements.