(cmake) Minor updates