Project fixes plus latest SDK version