Some changes to DEB generator