Fix crashes due to API 19, Version 2.4