Build system minor changes