Shan's fixes & new build