Small, miscellaneous fixes

format check gonna fail