Some tiny improvements