fix issues with last commit on legacy platforms