Fixing warnings
Using setter for velocity