* Fixed build time issues