Fixing some warning