+ all: fix compilation issues