Fixed a subtle aspect bug and convariant return type bug.