Fix warning
Fix overflow