Fixed some stub problems