build: build related fixes