Updates to work with last release of Corona (09/2014)