some minor changes for cmake