Solved more warnings