build: Minor improvments (2)