Coding style fixes that are enforced by upstream recipe