Fixed some problems in the legacy classes