Updates for client feedback issues