Fixed setfaults