Work on bringing opensource compatibility