Build configuration changes

Improved build procedure.