Adjusted some values and fixed a warning