Modify to work on Ubuntu (for dev and CI only)