Make gcc compatible again. Minor changes.