Fixed some problems due to refactoring in previous revisions.