Updates for buck and dkan