minor: build fixes and cleanup