Fixing up clock options

Change-Id: Ia1fec7adabc24c43dad7432958c7dced984b78c6