more friendly open-source changes