Bug fixes part Duex