[PATCH 21.5] GCC4.1 lwlib fixes