Fixed Issues with Build