fixed minor problems causing from the version switches