Fixed some strict errors