minor changes for easier continuous integration