Corrected multiple problems regarding older APIs.