[PATCH v2 2/2] fixups for LTO enabled build