Fixing some strict warnings