Last changes for build system