#786 Misc lint