Fixed some issues.
Preparation for merge.