Generic setters fixed