Fixed some aspects.