Removed some strict warnings