Update build configuration
Minor adjustments in the code