Cleaning up for differing distros