Fixed build issues with new 4.0 SDK