Small, miscellaneous fixes