Fixed some post system refactor issues.