Fixed some strict bugs.