forum #59549 & #56373: Fix for compiler errors on some setups