Fixing minor issues with version 3.5 and up