[12796] Fixup two recent commits

Thanks to Chero and DasBlub for pointing