[1.5] Remove some simple warnings