latest tweaks to satisfy SDS-C compiler's stupid requirements