Some minor changes and switch version to 2.4