Enabled more pieces from previous versions.