SDK 18 changes

I made additions to support 4.3