MFH: r560244 r560245

Fix build on i386

PR: 252280
Reported by: Victor Sudakov <vas@sibptus.ru>
Submitted by: dim

Fix build on armv6

PR: 251448
Submitted by: Martin Birgmeier <d8zNeCFG@aon.at>