Build file improvements