Old stuff cleanup, fixes.