Updated build sdk to 21. Fixed couple of exceptions.