Fixed and improved build attrobutes