build: Minor improvments