mikewlcheung Fixed minor bugs in osmasem