Various minor things without a separate project