Fixed some bugs.
Merge branch 'omLibrary' into ui